Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 28 Jun 2010 22:47:32 +0000 (22:47 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 28 Jun 2010 22:47:32 +0000 (22:47 +0000)
commitcdc8c3d4cfd5f56ca0271ee1e677b4eb5ea0e71a
tree3fd1833a305abc5aefdb872efaa48ddaa2b6c0b3
parentc9db36a482f30339d07cdf3ba6cfe120e3cfb51c
parent53722fc0266252a294a3bd78051732033cab7988
Merge from mainline.